Change the return types of the gchar ** getters to be more const correct.

2004-11-08  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkaboutdialog.[hc]: Change the return types of the
	gchar ** getters to be more const correct.  (#157566, Mariano
	Suárez-Alvarez)

diff --git a/ChangeLog b/ChangeLog
index 74ddb3842bcf5fd71df1ff8dd30e8c391dd6b842..3d97f9cc123114bb0ee82bac2a4eec1b279225ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-11-08  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkaboutdialog.[hc]: Change the return types of the 
+       gchar ** getters to be more const correct.  (#157566, Mariano 
+       Suárez-Alvarez)
+
        * gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_init): Add
        uri targets before text targets, to make file dnd work 
        better.  (#157651, Christian Persch)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 74ddb3842bcf5fd71df1ff8dd30e8c391dd6b842..3d97f9cc123114bb0ee82bac2a4eec1b279225ca 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2004-11-08  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkaboutdialog.[hc]: Change the return types of the 
+       gchar ** getters to be more const correct.  (#157566, Mariano 
+       Suárez-Alvarez)
+
        * gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_init): Add
        uri targets before text targets, to make file dnd work 
        better.  (#157651, Christian Persch)

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 74ddb3842bcf5fd71df1ff8dd30e8c391dd6b842..3d97f9cc123114bb0ee82bac2a4eec1b279225ca 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,9 @@
 2004-11-08  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkaboutdialog.[hc]: Change the return types of the 
+       gchar ** getters to be more const correct.  (#157566, Mariano 
+       Suárez-Alvarez)
+
        * gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_init): Add
        uri targets before text targets, to make file dnd work 
        better.  (#157651, Christian Persch)

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 74ddb3842bcf5fd71df1ff8dd30e8c391dd6b842..3d97f9cc123114bb0ee82bac2a4eec1b279225ca 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,9 @@
 2004-11-08  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkaboutdialog.[hc]: Change the return types of the 
+       gchar ** getters to be more const correct.  (#157566, Mariano 
+       Suárez-Alvarez)
+
        * gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_init): Add
        uri targets before text targets, to make file dnd work 
        better.  (#157651, Christian Persch)

diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c
index 49168f27bd47d9431389b65da01e4cfe68a18687..769f190b62467190bd07e415841767c9a680f41e 100644 (file)
--- a/gtk/gtkaboutdialog.c
+++ b/gtk/gtkaboutdialog.c
@@ -560,13 +560,13 @@ gtk_about_dialog_set_property (GObject      *object,
       gtk_about_dialog_set_logo (about, g_value_get_object (value));
       break; 
     case PROP_AUTHORS:
-      gtk_about_dialog_set_authors (about, (gchar**)g_value_get_boxed (value));
+      gtk_about_dialog_set_authors (about, (const gchar**)g_value_get_boxed (value));
       break;
     case PROP_DOCUMENTERS:
-      gtk_about_dialog_set_documenters (about, (gchar**)g_value_get_boxed (value));
+      gtk_about_dialog_set_documenters (about, (const gchar**)g_value_get_boxed (value));
       break;   
     case PROP_ARTISTS:
-      gtk_about_dialog_set_artists (about, (gchar**)g_value_get_boxed (value));
+      gtk_about_dialog_set_artists (about, (const gchar**)g_value_get_boxed (value));
       break;   
     case PROP_TRANSLATOR_CREDITS:
       gtk_about_dialog_set_translator_credits (about, g_value_get_string (value));
@@ -1114,7 +1114,7 @@ gtk_about_dialog_set_website_label (GtkAboutDialog *about,
  *
  * Since: 2.6
  **/
-gchar **
+G_CONST_RETURN gchar * G_CONST_RETURN *
 gtk_about_dialog_get_authors (GtkAboutDialog *about)
 {
   GtkAboutDialogPrivate *priv;
@@ -1123,7 +1123,7 @@ gtk_about_dialog_get_authors (GtkAboutDialog *about)
 
   priv = (GtkAboutDialogPrivate *)about->private_data;
 
-  return priv->authors;
+  return (const gchar * const *) priv->authors;
 }
 
 /**
@@ -1138,7 +1138,7 @@ gtk_about_dialog_get_authors (GtkAboutDialog *about)
  **/
 void
 gtk_about_dialog_set_authors (GtkAboutDialog  *about, 
-                             gchar          **authors)
+                             const gchar    **authors)
 {
   GtkAboutDialogPrivate *priv;
   gchar **tmp;
@@ -1148,7 +1148,7 @@ gtk_about_dialog_set_authors (GtkAboutDialog  *about,
   priv = (GtkAboutDialogPrivate *)about->private_data;
 
   tmp = priv->authors;
-  priv->authors = g_strdupv (authors);
+  priv->authors = g_strdupv ((gchar **)authors);
   g_strfreev (tmp);
 
   if (priv->authors != NULL)
@@ -1170,7 +1170,7 @@ gtk_about_dialog_set_authors (GtkAboutDialog  *about,
  *
  * Since: 2.6
  **/
-gchar **
+G_CONST_RETURN gchar * G_CONST_RETURN *
 gtk_about_dialog_get_documenters (GtkAboutDialog *about)
 {
   GtkAboutDialogPrivate *priv;
@@ -1179,7 +1179,7 @@ gtk_about_dialog_get_documenters (GtkAboutDialog *about)
 
   priv = (GtkAboutDialogPrivate *)about->private_data;
 
-  return priv->documenters;
+  return (const gchar * const *)priv->documenters;
 }
 
 /**
@@ -1194,7 +1194,7 @@ gtk_about_dialog_get_documenters (GtkAboutDialog *about)
  **/
 void
 gtk_about_dialog_set_documenters (GtkAboutDialog *about, 
-                                 gchar         **documenters)
+                                 const gchar   **documenters)
 {
   GtkAboutDialogPrivate *priv;
   gchar **tmp;
@@ -1204,7 +1204,7 @@ gtk_about_dialog_set_documenters (GtkAboutDialog *about,
   priv = (GtkAboutDialogPrivate *)about->private_data;
   
   tmp = priv->documenters;
-  priv->documenters = g_strdupv (documenters);
+  priv->documenters = g_strdupv ((gchar **)documenters);
   g_strfreev (tmp);
 
   if (priv->documenters != NULL)
@@ -1226,7 +1226,7 @@ gtk_about_dialog_set_documenters (GtkAboutDialog *about,
  *
  * Since: 2.6
  **/
-gchar **
+G_CONST_RETURN gchar * G_CONST_RETURN *
 gtk_about_dialog_get_artists (GtkAboutDialog *about)
 {
   GtkAboutDialogPrivate *priv;
@@ -1235,7 +1235,7 @@ gtk_about_dialog_get_artists (GtkAboutDialog *about)
 
   priv = (GtkAboutDialogPrivate *)about->private_data;
 
-  return priv->artists;
+  return (const gchar * const *)priv->artists;
 }
 
 /**
@@ -1250,7 +1250,7 @@ gtk_about_dialog_get_artists (GtkAboutDialog *about)
  **/
 void
 gtk_about_dialog_set_artists (GtkAboutDialog *about, 
-                             gchar         **artists)
+                             const gchar   **artists)
 {
   GtkAboutDialogPrivate *priv;
   gchar **tmp;
@@ -1260,7 +1260,7 @@ gtk_about_dialog_set_artists (GtkAboutDialog *about,
   priv = (GtkAboutDialogPrivate *)about->private_data;
   
   tmp = priv->artists;
-  priv->artists = g_strdupv (artists);
+  priv->artists = g_strdupv ((gchar **)artists);
   g_strfreev (tmp);
 
   if (priv->artists != NULL)

diff --git a/gtk/gtkaboutdialog.h b/gtk/gtkaboutdialog.h
index 0e507508047dfe5a7054d5d89b6e6a1c54dbfbb1..e802d8dcc26136f4ac2305672bc10cab26573154 100644 (file)
--- a/gtk/gtkaboutdialog.h
+++ b/gtk/gtkaboutdialog.h
@@ -85,15 +85,15 @@ void                   gtk_about_dialog_set_website            (GtkAboutDialog
 G_CONST_RETURN gchar  *gtk_about_dialog_get_website_label      (GtkAboutDialog  *about);
 void                   gtk_about_dialog_set_website_label      (GtkAboutDialog  *about,
                                                                const gchar     *website_label);
-gchar                **gtk_about_dialog_get_authors            (GtkAboutDialog  *about);
+G_CONST_RETURN gchar * G_CONST_RETURN * gtk_about_dialog_get_authors            (GtkAboutDialog  *about);
 void                   gtk_about_dialog_set_authors            (GtkAboutDialog  *about,
-                                                               gchar          **authors);
-gchar                **gtk_about_dialog_get_documenters        (GtkAboutDialog  *about);
+                                                               const gchar    **authors);
+G_CONST_RETURN gchar * G_CONST_RETURN * gtk_about_dialog_get_documenters        (GtkAboutDialog  *about);
 void                   gtk_about_dialog_set_documenters        (GtkAboutDialog  *about,
-                                                               gchar          **documenters);
-gchar **               gtk_about_dialog_get_artists            (GtkAboutDialog  *about);
+                                                               const gchar    **documenters);
+G_CONST_RETURN gchar * G_CONST_RETURN * gtk_about_dialog_get_artists            (GtkAboutDialog  *about);
 void                   gtk_about_dialog_set_artists            (GtkAboutDialog  *about,
-                                                               gchar          **artists);
+                                                               const gchar    **artists);
 G_CONST_RETURN gchar  *gtk_about_dialog_get_translator_credits (GtkAboutDialog  *about);
 void                   gtk_about_dialog_set_translator_credits (GtkAboutDialog  *about,
                                                                const gchar     *translator_credits);